Fix set_param in several layers that were rejecting parameters from f…

…iles with old format.
synfig · Aug 29, 2013 · 1c6c0b3 · 1c6c0b3
1 parent 8707d3a
commit 1c6c0b3
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 15 deletions.
diff --git a/synfig-core/src/modules/lyr_freetype/lyr_freetype.cpp b/synfig-core/src/modules/lyr_freetype/lyr_freetype.cpp
@@ -531,7 +531,7 @@ Layer_Freetype::set_param(const String & param, const ValueBase &value)
 	IMPORT_VALUE_PLUS(param_grid_fit,needs_sync_=true);
 
 	if(param=="pos")
-		set_param("origin", value);
+		return set_param("origin", value);
 
 	return Layer_Composite::set_param(param,value);
 }

diff --git a/synfig-core/src/modules/lyr_std/curvewarp.cpp b/synfig-core/src/modules/lyr_std/curvewarp.cpp
@@ -368,7 +368,7 @@ CurveWarp::set_param(const String & param, const ValueBase &value)
 	IMPORT_VALUE_PLUS(param_bline, sync());
 
 	if(param=="offset")
-		set_param("origin", value);
+		return set_param("origin", value);
 
 	return false;
 }

diff --git a/synfig-core/src/modules/lyr_std/shade.cpp b/synfig-core/src/modules/lyr_std/shade.cpp
@@ -121,7 +121,7 @@ Layer_Shade::set_param(const String &param, const ValueBase &value)
 	IMPORT_VALUE(param_invert);
 
 	if(param=="offset")
-		set_param("origin", value);
+		return set_param("origin", value);
 
 	return Layer_Composite::set_param(param,value);
 }

diff --git a/synfig-core/src/modules/lyr_std/sphere_distort.cpp b/synfig-core/src/modules/lyr_std/sphere_distort.cpp
@@ -104,9 +104,7 @@ Layer_SphereDistort::set_param(const String & param, const ValueBase &value)
 	IMPORT_VALUE(param_clip);
 
 	if(param=="percent" && param_amount.get_type()==value.get_type())
-	{
-		set_param("amount", value);
-	}
+		return set_param("amount", value);
 
 	return Layer::set_param(param,value);
 }

diff --git a/synfig-core/src/modules/lyr_std/xorpattern.cpp b/synfig-core/src/modules/lyr_std/xorpattern.cpp
@@ -77,7 +77,7 @@ XORPattern::set_param(const String & param, const ValueBase &value)
 	IMPORT_VALUE(param_size);
 
 	if(param=="pos")
-		set_param("origin", value);
+		return set_param("origin", value);
 
 	return Layer_Composite::set_param(param,value);
 }

diff --git a/synfig-core/src/modules/mod_filter/halftone2.cpp b/synfig-core/src/modules/mod_filter/halftone2.cpp
@@ -124,7 +124,7 @@ Halftone2::set_param(const String & param, const ValueBase &value)
 	HALFTONE2_IMPORT_VALUE(halftone.param_origin);
 
 	if(param=="offset")
-		set_param("origin", value);
+		return set_param("origin", value);
 
 	return Layer_Composite::set_param(param,value);
 }

diff --git a/synfig-core/src/modules/mod_geometry/checkerboard.cpp b/synfig-core/src/modules/mod_geometry/checkerboard.cpp
@@ -111,7 +111,7 @@ CheckerBoard::set_param(const String &param, const ValueBase &value)
 	IMPORT_VALUE(param_size);
 
 	if(param=="pos")
-		set_param("origin", value);
+		return set_param("origin", value);
 
 	for(int i=0;i<2;i++)
 		if(param==strprintf("pos[%d]",i) && value.get_type()==ValueBase::TYPE_REAL)

diff --git a/synfig-core/src/modules/mod_geometry/circle.cpp b/synfig-core/src/modules/mod_geometry/circle.cpp
@@ -104,9 +104,7 @@ Circle::ImportParameters(const String &param, const ValueBase &value)
 	IMPORT_VALUE(param_origin);
 	IMPORT_VALUE(param_falloff);
 	if(param=="pos")
-	{
-		ImportParameters("origin",value);
-	}
+		return ImportParameters("origin",value);
 
 	return Layer_Composite::set_param(param,value);
 }

diff --git a/synfig-core/src/modules/mod_gradient/curvegradient.cpp b/synfig-core/src/modules/mod_gradient/curvegradient.cpp
@@ -518,7 +518,7 @@ CurveGradient::set_param(const String & param, const ValueBase &value)
 	IMPORT_VALUE(param_fast);
 
 	if(param=="offset")
-		set_param("origin", value);
+		return set_param("origin", value);
 
 	return Layer_Composite::set_param(param,value);
 }

diff --git a/synfig-core/src/modules/mod_particle/plant.cpp b/synfig-core/src/modules/mod_particle/plant.cpp
@@ -352,9 +352,9 @@ Plant::set_param(const String & param, const ValueBase &value)
 	IMPORT_VALUE(param_use_width);
 
 	if(param=="offset")
-		set_param("origin", value);
+		return set_param("origin", value);
 	if(param=="seed")
-		set_param("random", value);
+		return set_param("random", value);
 
 	return Layer_Composite::set_param(param,value);
 }